(improved details